Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses client / java.policy

diff --git a/ruralHouses client/java.policy b/ruralHouses client/java.policy
new file mode 100644 (file)
index 0000000..a38bc88
--- /dev/null
+++ b/ruralHouses client/java.policy
@@ -0,0 +1,9 @@
+grant {
+permission java.security.AllPermission;
+};
+// If there problems with permissions:
+// permission java.security.AllPermission;
+//permission java.net.SocketPermission "localhost:1099", "connect,resolve";
+//permission java.net.SocketPermission "*", "accept,resolve";
+//permission java.io.FilePermission "casas.db4o", "delete,read,write";
+//permission java.util.PropertyPermission "*", "read";
\ No newline at end of file